Merge "Apks are again allowed to use vendor libs as before" into oc-mr1-dev