Remove redundant screen off animation
Merge branch 'jellybean3' of github.com:TheCollective/android_frameworks_base into jellybean3

Remove redundant screen off animation, update square battery