Fix ManifestMerger issues
am: f9abc344d6

Change-Id: Ife4901ae5493c5e45640376055c692d0014bd997