am 6b4e5b7f: Merge "Fix misuse of ."

* commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
  Fix misuse of $(my-dir).