Merge "brctl: fix compilation error"