Fix ManifestMerger issues
am: 3c5bed268b

Change-Id: Ia757103a30042636ceab8a794a5bfadd298c28f1