Merge "Increase FUSE attr timeout for /sdcard and /sdcard/Android"