Merge "Add es5-shim library v3.4.0"