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

Change-Id: I3d1e48b13b20536fb9ec863abf743ee12ca41342