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