Google should be picking another OEM (Lenovo?) and doing everything it can to push its sales, to create competition for Samsung. The whole point of Android was that by making the OS free software, it would neuter the OEMs, not give them the power to fork the OS.