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

Change-Id: Idf05d910d19b603b0b608ff351bf6b425990a069