Merge "tests: Move to Android.bp."
am: b1ff1bc43b

Change-Id: I3d964a6f4d60b031209a02625b2fdee5d2c75a6b