Merge "Revert "support different boot partition sizes in aosp_arm64"" am: 29beb858ef

Change-Id: I8cf4b0a6856abf1233d221d36bcd1cb4a1c1ec10