Updates for android travis tests