Fixes for building under android build system :)