Merge "Increase system image size to 650M for generic_arm64"