Merge "tests: Move to Android.bp." am: b1ff1bc43b am: 6956957499
am: 6a9fb19b0f

Change-Id: I6e2da6cef5a004b9968c9cdf272fb1f81089c94e