Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""