Merge "Remove unused tool files from SDK tools update."