Merge "Ability to generate SDK system-images for arm64 and x86_64"