Merge "Remove obsolete BRILLO variable"
am: dbfbf85f0c

Change-Id: I64c9e1b2dfb78af0bdddbd074398f36bdd20f327