Merge "Fix UnixFileTest#test_getUsableSpace on seed am: b7bde9e1 am: 911f9a23" into nyc-mr1-dev-plus-aosp