Adjust externs to make it work fine with latest util.NativeMap macro