[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 -s ours
am skip reason: Change-Id I66b57de91042bfd56ba54a3659843d8cf7873955 with SHA-1 903a1ca7 is in history
Change-Id: Ib68d17d6ed4472953c1f54654198db6a56b41577