Merge branch 'kk-ras-mr1' of https://github.com/rascarlo/android_frameworks_base into kk