Merge "SDK: Build/Platform-tools revision 17."