Merge "DO NOT MERGE Add webkit plumbing for file origin policy"