Fix errors of missing removals
also fix beni
Merge github.com:PAC-man/android_vendor_pac into cm-10.1
Merge github.com:PAC-man/android_vendor_pac into cm-10.1