all of the builds. Fix that. We really need to get this generic_with_google product out of build/target and into vendor/google, but that can come later. BUG=1786404 Automated import of CL 146687