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