Merge "Add function definitions for MapInfo." am: 4c1560ce5c am: 0597e4a8af
am: c3671b91da

Change-Id: I4511d130a9cf704f7495fe10ffdd6757d33da31b