Merge "Add Android.bp to build U-Boot's mkimage." am: b8d2f2183e
am: 83ee47160f

Change-Id: Ide9fc72ec435c1405a818b5b64cad73adfdd790c