Merge "idmap2: include AndroidManifest.xml in CRCs"