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