Merge "Fix Javadoc for StrictMode#permitUnbufferdIo" am: b8648ae07a
am: c847aae2cf

Change-Id: Ic8a35213b2699c28a0427a0930b330a3a35a34ad