Update AOSP portion of fingerprints

Change-Id: I3cf5f45fe3d5993d6bbf402e9088c966f81ff470
Update a few vendor fingerprints

There are likely a ton more that need updating,... but these are just ones I found easily

Change-Id: I2f4f7a3c1f544bd897eac6156726193d151c3226
Restore user lunch combos

Change-Id: Id58f40baf924923890bcbbb1edf114a4b2f80490
Merge remote-tracking branch 'upstream/kk44' into kk44
Merge branch 'kk44' of https://github.com/usmcamgrimm/vendor_vanir into kk44