Merge "Convert misc tests Android.mk files to Android.bp" am: ce22e11274
am: 86e0168d99

Change-Id: I4a803f390f332d0c018cda1f0085a5da5201641d