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

Change-Id: I92ee23cc68a6a204f0cb936c6242475a49a27145