Merge "Use the correct MKBOOTIMG."