am 1cd030be: Merge "Switch installd to compile as C++."

* commit '1cd030be59c108cde25234f0d2da83a68a7cdd26':
  Switch installd to compile as C++.