Merge "Add mkbootimg_test"