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