updated android version. merging with master for push to google play