[automerger skipped] Merge "support different boot partition sizes in...
[automerger skipped] Merge "support different boot partition sizes in aosp_arm64" into rvc-dev am: 27e8474d -s ours am: cd33816c -s ours
am skip reason: Change-Id I66b57de91042bfd56ba54a3659843d8cf7873955 with SHA-1 53226684 is in history
Change-Id: I1c8c9444b324c300a14c46ec09df4176045a2c69