am 40e18300: am 36ad3f1c: Merge "Add dependency on libbase."

* commit '40e183005ecf05938f27a9722f419e71bb0e4257':
  Add dependency on libbase.