Merge "Revert "Add Android.bp to build U-Boot's mkimage."" am: a2acd31a58 am: 72d7fbb699 Change-Id: I37f6f39a9a7073f890512688e9d3474c99a37fbf