Merge "Revert "Revert "mkbootimg: Build mkbootimg with Soong."""