am dd40d693: am 1cf83956: Merge "Use all-subdir-cpp-files"

* commit 'dd40d693dfc3030cf8e9b0bf9f450f2276feb9ca':
  Use all-subdir-cpp-files