Add manifest-merger module am: 435f021d98
am: 25de7bcfa6

Change-Id: I75e1c8440865685327db1bdd9991ac3748c9e2c8