Merge "Remove obsolete BRILLO variable"
am: d3a4473be9

Change-Id: Iff8ac2da23b2ffe7c27610e3d59ef574c6c7577c