Fix ManifestMerger issues
am: 4a5ff8044c

Change-Id: I3a250a330cf193fd73a699e5d84d7d3455cccb44
tree: f9f79314b4da21860e149362330cbfd9d46670eb
  1. library/
  2. navigationbar/
  3. tools/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg