Update build ID fingerprint
Update path to vendor
Move some inheritance staments around so we get the variant specific device and vendor inclusions
Add librild path here so it's parsedand set properly in build.prop