Merge "Remove system/core/mkbootimg"