[automerger skipped] Merge "Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr." into pi-dev
am: 0a5bc29353  -s ours

Change-Id: I304bebe3e3303a9b340cbc08a6919f92ee43d4f5