Merge "Convert tests/**/Android.mk files to Android.bp, part II" am: e1f19a6ef9
am: 3c611bc533

Change-Id: Id521f08f6f2225edaf17e5ce99b971d34252df24