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

Change-Id: Idbbad8f8773a33d2e70cff233bf10d1528d3ff55