Merge "trusty*: Android.mk -> Android.bp"