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

Change-Id: I82cbaef842f9c310dec25929e005c5d849eb00b2