[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 am: 00b9d0d2 am: 82b38b0e -s ours
am skip reason: Change-Id I66b57de91042bfd56ba54a3659843d8cf7873955 with SHA-1 53226684 is in history
Change-Id: I45c4ee3d1002d21a81e71420e246090c27e1d797