cleanup vendor (maka)

Change-Id: I83493581e6b9178d186f4780c2bc7652d8adb778
derp

Change-Id: Ia3aba45ed05c5b69a5441638758cbabdc1171b22
Merge branch 'jb43' of git://github.com/ParanoidAndroid/android_vendor_pa into jb43