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

* commit '04c5bcf2bb82099fa8c02dd9a38ccac36d326373':
  Fix indirect misuse of $(my-dir).