am 6aa932ca: Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE"

* commit '6aa932cabf6ed14c35ae49b78464e2504af87c58':
  Add dependency of import_includes on LOCAL_MODULE_MAKEFILE