[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 -s ours am: 122584c4 -s ours
am skip reason: Change-Id I91181853b26815e68a2fa2216b68579780d034dc with SHA-1 e0c2dde5 is in history
Change-Id: I7672f372f61be172b7ed479a20bd7bd7a439ffe5