Fix ManifestMerger issues
am: 5fdc24aa6c

Change-Id: I0f4caaf968fdca40124e08184b29a9662c349bc0