Merge "Remove system/core/mkbootimg" am: b89a4434ba am: e966ac3666
am: 771944aaff

Change-Id: I44d70fe5610b8737a5ae96accaea92623532d0e3