Unify d2

Change-Id: I53d4f9ff9fea6c545c5cdfcc8011c69175fb53eb
Merge remote-tracking branch 'aokp/kitkat' into kitkat