Merge "uncrypt: remove O_SYNC to avoid time-out failures"