Added a new function to update_android_id.
Fix merge conflicts.