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

Change-Id: I269a07da7aaf362949a083bf6ac32e1e44ed9f94