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