Add some fixes to compile android