Merge "Increment platform-tools version to 31.0.0."