android-951
Added device id header to catalog requests
[geometry] Get rid of MercatorBounds, refactor to namespace mercator
[platform] MapOptions is renamed to MapFileType