Merge branch 'upstream/android-3.0' into linaro-android-3.0