am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."

* commit '160c39d8a53793cb17dd8a9312d56eafced3cc0d':
  Fix indirect misuse of $(my-dir).