New subsurface code
Enable building for android x86