Merge "Define __BRILLO__ only for target modules"
am: e63d3328df

* commit 'e63d3328dfc5a3e46233bf6fcc20a17e15d3545c':
  Define __BRILLO__ only for target modules