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

Change-Id: I27a191f4f03b47c05f8c0809e7bbc8966cbaa5fa