Updated to latest google & devkit api version