cleanup duplicates
Merge branch 'jellybean' of github.com:BAM-Team/android_frameworks_base into jellybean