Merge "Remove obsolete __BRILLO__ ifdef."