Merge "Remove obsolete __BRILLO__ ifdef." am: a95e9aff7c
am: ec43ed7d46

Change-Id: I5d805ca634f8d11799d4333a0de53dcad821bb76