[automerger skipped] Merge "initial GKI boot.img support" into rvc-dev am:...
[automerger skipped] Merge "initial GKI boot.img support" into rvc-dev am: 79875a12 am: 709390ee -s ours
am skip reason: Change-Id I91181853b26815e68a2fa2216b68579780d034dc with SHA-1 3363a0b8 is in history
Change-Id: I2232439c590d8609c18be55372c1b1fe8a9f8c76