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

Change-Id: Iae72463e17954f9f81039d1a2844ef0ff99cfbf7