Merge "Fix Javadoc for StrictMode#permitUnbufferdIo"