Merge "Add Soong tools to PATH"