Reverting because 'Back' button is too big
Merge branch 'kk' of github.com:droidjam/platform_frameworks_base into kk