Merge "Update for long long -> off64_t for fstab.length" am: 1f66578d6f
am: 21197a7f2b

Change-Id: I70bc51263711a1bd810c7347c5817d0cd1695b18