Merge remote branch 'common/android-2.6.35' into android-msm-2.6.35