m7: clean up

Change-Id: Ibc1121831c073e61fe9a84da5656a7522f3a122a
Merge branch 'jb43-legacy' of https://github.com/ParanoidAndroid/android_vendor_pa into jb4.3