am 3e1aed37: am f945b0ce: am 5352d400: Merge "FileSystemPermissionTest: Eliminate tests which access /proc/1/mounts" * commit '3e1aed37': FileSystemPermissionTest: Eliminate tests which access /proc/1/mounts