am 56e5ebeb: Merge "Prepare for removal of platform builds."

* commit '56e5ebebd56a3a9de91a42c8a96c48ecde5f2a8c':
  Prepare for removal of platform builds.