Merge "AArch64 code alignment is 4 for OatWriter"