Merge "Fix broken android.theme.cts.ThemeHostTest" into oc-dev