[automerger skipped] Fix import of android-support-annotations am: 97f0b1979b am: be834c40f0  -s ours
am: c87ab1d540  -s ours

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