android-95
Added device id header to catalog requests
Got rid of the old style std/ includes for several files, mostly in map/ and platform/.