d4a4b452bc
Bug: 16031597 This change also removes some unnecessary code from ScriptC construction. Change-Id: I6680109deb34de841dfade769d556f5060aee423