Merge "support different boot partition sizes in aosp_arm64" am: ade028ea9e

Change-Id: I2f9b6dba41127c665dead70b0ff83760796616f8