[automerger skipped] Distinguish boot images by target rather than arch am:...
[automerger skipped] Distinguish boot images by target rather than arch am: 163bda65 -s ours am: c6643ed9 -s ours
am skip reason: Change-Id Iea73c77367affb074f97a0fc318389417ce537da with SHA-1 c177ebec is in history
Change-Id: Ic067a45ce5603c39b300731a7c154a45b8aa275f