Merge "Remove CtsThemeHostTestCases from general-tests suite"
am: ea8c4f19aa

Change-Id: I0a396e15544c079fbd88da9837a0fea7e784601c