FIxes to build against updated es2 build
Can build against cinder head again for the desktop app.
CMake fixes to build against cinder_head