PIE: preparations for gap

Change-Id: I1059186b93e31c622f5c3fb4ebdae1b9b27b4060
arzbhatias anti smudge treatment

Change-Id: Ic70823adab59eaf0d5210d8131781a7e79c213c9
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_frameworks_base into jellybean