Fix ManifestMerger issues
am: 4543e61753

Change-Id: I127219a706dd762ceed853cc9746c577d75b1bcb