Merge "Convert miscellaneous tests/**/Android.mk files to Android.bp" am: 57a44e480b am: c3a9b70274
am: 4a1d7fc8fd

Change-Id: Idba629af93099c120fb6bbd83f4485390524a492