Merge "Convert tests to Android.bp"
am: 354924486d

Change-Id: I628a723fb5b790e81317456b0e2bd1456366585e