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