am 8d894a70: (-s ours) am 98013c6f: am cc8a21a2: SDK: Generate build-tools package. DO NOT MERGE.

* commit '8d894a705a33ad14e4f650a07d6bbd7e10752d81':
  SDK: Generate build-tools package. DO NOT MERGE.