am 7dece61e: am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.

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