Merge "Remove obsolete __BRILLO__ ifdef."
am: a95e9aff7c

Change-Id: I5099d1c3949b6fd25d7bdaa0f671ec7eaf3d79a1