Merge "Partially Convert hostsidetests/theme/**/Android.mk files to Android.bp"
am: f63969d08d

Change-Id: I09f3881b5cb716b420c61093a77e6647d7a7c702