Merge "update /vendor/*/vndk-sp to /system/*/vndk-sp" into oc-dev