am 71e5dd30: am 7a772619: Merge "core: support make 4.00"

* commit '71e5dd3055dc6a441ce20f0905f1b3893f79d27e':
  core: support make 4.00