Fix ogles2 shaders path without android
Fix ogles linking order
Do not use std::timed_mutex
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/CMakeLists.txt