Merge "Clean ThemeHostTest to use log utility" into oc-dev
am: 0f0e55a941

Change-Id: I001928fe1fbb4a5c8d47f47ad0a4f4791400a511