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