Cleaned up Vendor

Change-Id: I1e50c6116d9f7c2be8efe220dde3e6278bdfd3cb
Merge branch 'jb-test' of github.com:IllusionProject/android_vendor_illusion into HEAD