Merge remote-tracking branch 'remotes/aosp2/android-omap-tuna-3.0-jb-mr1.1' into mr1-exp