Merge "libtrusty: Android.mk -> Android.bp"
am: de70e33092

Change-Id: Ic18c86fd29f3793026fb830d91ad44d62b3aed42