Merge "Update golden images for ThemeHostTest and fix generate script" into oc-dev am: 9381387288 am: 30dce000ed
am: 86d76c3688

Change-Id: If59e9fe71a9e0fb803faff01091e2336bae1384c