Repair theme elements to AoCP prefrence
Merge branch 'jellybean2' of https://github.com/TheCollective/android_frameworks_base into jellybean2