Android N IOT Preview 4 (NIH40E)
Fix compatibility issues with Java 1.8 Map
am: e091a345b2

* commit 'e091a345b250b1ce4212d4c9d13649fe9c625bbe':
  Fix compatibility issues with Java 1.8 Map