am 22d8c0ed: Merge "Minor build cleanup."

* commit '22d8c0edd356c2ee24c520661f4570330a849a48':
  Minor build cleanup.