Merge "Convert hostsidetests/tv/**/Android.mk files to Android.bp"
am: df75849c13

Change-Id: Ie7372b8a3ab5e92bd8f7ac8bd5b406426f691059