am 780bdd6a: am ab59266d: Merge "Add lib dirs to cts distribution."

* commit '780bdd6a1363cfe2fb9425647e0458dd2aee43f4':
  Add lib dirs to cts distribution.