Merge "Fix file channel creation when mode is O_RDONLY." am: c4d79296eb
am: 77b7c4558c

Change-Id: I64687de905e3166342b13b970e8ea57e89817488