Merge "Convert tests/**/Android.mk files to Android.bp"
am: 40ff4f7d83

Change-Id: If96014624542d6c99f7d0841347806954dbd4a42