Android N Preview 4 (NPD56N)
Merge "Backport: Work around a type inference change in javac"