Unify d2

Change-Id: I53d4f9ff9fea6c545c5cdfcc8011c69175fb53eb
Revert "add more vzw eri's"

Needs to be reverted with the Generic multi-carrier overlays

This reverts commit 9106c9022074a27dd10da05c3c770f2d50e040f7.

Change-Id: I1732c37e4484b6f51bbbeac584c236fe3caeb883
Merge pull request #2 from AOKP/kitkat

Merge branch "aokp" into MIAOKP