am 001bb797: (-s ours) Merge "Add original config.h from 3.8.1"

# Via Ben Cheng (1) and Gerrit Code Review (1)
* commit '001bb797b8155c779c758ffa9a948657948199ca':
  Add original config.h from 3.8.1