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

Change-Id: Ia4e91ee9eb77fbd5d9063ce28506fe60b86aec36