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