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

Change-Id: I9587460646d9d83a3bfcc41be0ec71167a45db08