Merge "Add O_DIRECT to OsConstants" am: cf77d08b9b
am: 21c4629c0c

Change-Id: I45638c53efb47fb7eca1b3e6e4875c3e5ab38dc3