am bb4ed9aa: am 815d9bb1: Merge "Add a static dependency on libbase."

* commit 'bb4ed9aa3aec4b787c8cd5e4f04b7f95302b76f9':
  Add a static dependency on libbase.