Merge "Make images arm-64 compatible"