Merge "Enable interception of more filesystem APIs."