Dropped in new android sdk, updated zone ids.