Android N IOT Preview 2 (NIG40)
Merge "Backport: Work around a type inference change in javac"