Use consistent activity declaration in AndroidManifest.xml