Merge "CTS test for including a layout from a theme attribute" into oc-dev