Merge "Move __BRILLO__ to the core build system"
am: 3931873418

* commit '39318734186de8b2ed09d827f69877bf9bb8c9aa':
  Move __BRILLO__ to the core build system