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

Change-Id: I488c8026d23de84c025f9650de68f9521a8c18b5