Make Android work again - adapt to recent changes and fix use of GL-nonES function