changes for android native