Merge commit 'v2.6.32.9' into android-2.6.32