Remove autocollection of wifi mac, device id, and android id on android.
Log a warning if no aaid present
Version bump for Android SDK
Merge branch 'android-id-changes'