[580363] Fix MapType moniker and OCLstdlib
3 files changed