Reconcile many externals with CM.  Add some needed repos, remove some others

Basically it's this commit https://github.com/CyanogenMod/android/commit/4846fe6e1cac9d759ab4e44d0597b0fcf21b3211

I got  abit lazy in frameworks/opt and left our packages as is

Change-Id: Iade759fd8731ae2c1adb4598098dd22fe27bef9a