Merge "Buck: Allow to co-exist in tree and standalone plugins"