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

* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
  Add a static dependency on libbase.