Fixing build errors around google play libs.