Merge "Convert core/tests/**/Android.mk file to Android.bp"
am: d0fc8c9d5b

Change-Id: I2521964e5699950745f69cb9f9de680cfd43ac44