am 0c0e9b81: am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."

* commit '0c0e9b815332eca3b3626cc9c47759bbf5e48624':
  Try to catch more misuse of $(my-dir).