Merge "Revert "Have AssetFileDescriptor.AutoCloseInputStream use pread"" into udc-dev