Merge "Convert misc tests Android.mk files to Android.bp"
am: ce22e11274

Change-Id: I5389c6ba0e11204676c6a13175be781e26bb8905