Merge "Enable interception of more filesystem APIs."
am: b4b11e1fe5

Change-Id: Ief55416bb5840ed6689721cfdf529bfbb3ff07e7