am fa3fce92: (-s ours) am 7dece61e: am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.

* commit 'fa3fce9237c1d9641031d306242b45b979309f2c':
  SDK: Build/Platform-tools revision 17. DO NOT MERGE.