[automerger skipped] Add options to sign the prebuilt custom images. am:...
[automerger skipped] Add options to sign the prebuilt custom images. am: d9edddd6 am: 368dab01 -s ours
am skip reason: Change-Id Ifccfee5e8909697eef6ccda0cc352fa16a9f6db6 with SHA-1 f23364d2 is in history
Change-Id: Ia7169db66eb5e4e0777820c59de7e424fdd0cfdb