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

* commit 'ab59266db0d3d16ca58e06ad327a9909e45c1516':
  Add lib dirs to cts distribution.