Android N Preview 3 (NPD35K)
Merge "Work around a type inference change in javac"