am d61729c0: am b656410a: Merge "Use a separate config.h for config like defines."

* commit 'd61729c0a55ce139c57cbf526cbfd3e448e3d3f1':
  Use a separate config.h for config like defines.