Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread