Revert "Upgrade to ManifestMerger2"

This reverts commit a636f16b3422492b0941cafda7443e6c9443d0bb.

Bug: 36005379
Change-Id: If5516b34c103016529de4d591038e9e34260a8e8
2 files changed