Merge branch 'linux-3.0.y' into android-jb-mr1-v7