hg: jdk9/sandbox/langtools: Merge

[aleksey.shipilev at oracle.com]

Changeset: b99434fb0c5c
Author:    shade
Date:      2015-11-30 18:30 +0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/b99434fb0c5c

Merge

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
- test/tools/javac/diags/examples/DiamondRedundantArgs1.java
- test/tools/javac/generics/diamond/7002837/T7002837.out
- test/tools/javac/generics/diamond/neg/T8078473.out
- test/tools/javac/generics/diamond/neg/T8078473_2.out