Update to new Google support lib