Added text_wrap, Fixed test build
Fixes for building on Android