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

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