Merge "Convert misc tests Android.mk files to Android.bp"