Merge "Account for nonplat->vendor renaming on non-Treble devices." into pi-dev