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

Change-Id: I805d2400667c8ccc55a59300816b1f866f40c6f8