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

Change-Id: Ib3861fa4d73cc5c07c2c866efc2a06d38678e89e