Merge "Remove old build-tools/platform-tools implementation"