Merge "trusty*: Android.mk -> Android.bp"
am: e732d15337

Change-Id: Ie1e78fe387312f16aeee17d818999e9cc12d9ef9