Merge "Add mode to open call with O_CREAT" am: af78fe13a0 am: f6b468db7b am: 2b0fedb71e
am: b640267dd1  -s ours

Change-Id: I7de019ab141fd0f3164d0d489e8e8412ed13fcbd