Merge "Change the LP64 off_t/loff_t/off64_t definitions to reduce warnings."