Merge remote-tracking branch 'ls/jb2' into db42-a

Conflicts:
	luni/src/main/java/java/util/regex/Splitter.java

Conflicts:
	luni/src/main/java/java/util/regex/Splitter.java