Merge "AAPT2: Fix overzealous AndroidManifest fully qualified class names"