am 5c6002cc: Merge "Turn on .so path by default"

* commit '5c6002cc19cc3f1beffd204fd6cbca8bd75c0012':
  Turn on .so path by default