am 74f6b33e: am 22d8c0ed: Merge "Minor build cleanup."

* commit '74f6b33e54eb4e252004db611e12da6ffbad6f1c':
  Minor build cleanup.