Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/development into aosp