Update to SDK v3.1 with gaid/ifa wrapper modules