Merge "Revert "Add Android.bp to build U-Boot's mkimage.""