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

Change-Id: Ia1a6c26f4f786f22763ebde95b238887914951f4