Merge "Use a filegroup for the AndroidManifest.xml input"