Fixes for android build.