am 0a643374: am 6b4e5b7f: Merge "Fix misuse of ."

* commit '0a6433749dcd87039f6e31c04ea662b238310b17':
  Fix misuse of $(my-dir).