Update vendor naming conventions to align with how (I assume) CM will have it

Change-Id: I6c1f2abb464881807b5a355ca04253b0011de05f
Merge "Update vendor naming conventions to align with how (I assume) CM will have it" into lollipop