Merge "Add __RENAME_IF_FILE_OFFSET64." am: 0d6485eca4 am: b2870803ba
am: 0747ffb7a3

Change-Id: Ib2696d246a59cdb6b16c02b62109b570bd246d3c