Squash 4.3 changes.

Conflicts:
	luni/src/main/java/java/io/BufferedReader.java
	luni/src/main/java/java/util/zip/ZipEntry.java
	luni/src/main/java/java/util/zip/ZipFile.java

Change-Id: Iff3015ac62b6b8bb5069bb5d4cf09f997a299ff5