am 201f6b3e: Merge "Make modules depend on their makefile."

* commit '201f6b3e92a2ef2f3a117f33cd399d5304dd385a':
  Make modules depend on their makefile.