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

Change-Id: Ifda9db71a519cd64a5962aa497dc9f22fe31dfe9