Merge "Convert tests to Android.bp" am: 354924486d
am: 5d051113e2  -s ours

Change-Id: I65dfc6500aba48e2b10b25f41c57728ac88085e2