Merge "Bump platform-tools version number"