am 063d16f1: am ef7d1af6: Merge "Create a cache directory for our symlinked files if necessary."

* commit '063d16f179599bd050ede219d7abe33ebdc29a49':
  Create a cache directory for our symlinked files if necessary.