Merge "Add lib dirs to cts distribution."