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

Change-Id: I6ee78881219d81f19246f0d82089c108dfdd478f