Merge "restore permissions to /vendor for non-treble devices" into oc-dev