Merge "Convert hostsidetests/content/**/Android.mk file to Android.bp"