[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: 3c59d469 -s ours am: 6aebfcc0 -s ours

am skip reason: Change-Id Iea73c77367affb074f97a0fc318389417ce537da with SHA-1 c177ebec is in history

Change-Id: Ib8c89c1ff8f38a4c1e0adea8186c646358177ffc