Merge "Convert hostsidetests/content/**/Android.mk file to Android.bp"
am: 18ac232337

Change-Id: I2640d31caad8d4bf7d842b548502e118726f6b78