o Move the Set/Map/Iterator calls from JNI to Java o The JNI function receives arrays instead of Maps o Removed Set/Iterator calls from the Java code as suggested Change-Id: I34068bf24b61abaf2833dad1f65abc733ed760dd