[automerger skipped] Merge "Convert tests/**/Android.mk files to Android.bp, part II" am: e1f19a6ef9 am: 3c611bc533
am: 21a06f23e6 -s ours
am skip reason: change_id I886b6536a0ef1c8d21f15ec7ff9fdb9784d5b865 with SHA1 89414e1ed5 is in history

Change-Id: Icb46e2a1eec04013f97d45fc453c5ce4b7a519df