Merge "Attempt to run mkbootimg_test as part of unit tests CI"