Merge "Remove obsolete BRILLO variable"