Android N Preview 4 (NPD56N)
Merge "Fix compatibility issues with Java 1.8 Map"