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

Change-Id: I036b1a4ccb3e09132a9eb51aa579db58d2e7809d