Merge "No need to pass digest of AndroidManifest.xml around."