[android] Android: Getting "Manifest merger failed" error after updating to a new version of gradle