am 76b4a60a: am f7bb7921: Merge "Reorganize headers to improve documentation.  Mac prebuilts."

* commit '76b4a60a4afa9e33781c1d6daf3236ab5efbaf65':
  Reorganize headers to improve documentation.  Mac prebuilts.