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