Add manifest-merger module
am: 435f021d98

Change-Id: I2a23c59c30a7fe06935f9a4e8004015c012f9eb3