Merge "libtrusty: Android.mk -> Android.bp" am: de70e33092 am: 3257727096 am: bb3e2e96c7
am: 2483070b48

Change-Id: Ie923224a1d668530b9b8ca0f0803b669c5e6225b