Merge "Remove mkbootimg from the pathmap."