Merge "Remove system/core/mkbootimg"
am: b89a4434ba

Change-Id: I136fc5fc85046d97d9ecb495f009e51e3ab91fdc