Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0