Fix ManifestMerger issues
am: 3c5bed268b

Change-Id: Ia757103a30042636ceab8a794a5bfadd298c28f1
tree: e0dd5bce70132c5e7f81b4e221889f1fce8d248a
  1. library/
  2. PREUPLOAD.cfg