Merge "MKBOOTIMG override were missing in two places"