Merge "Relocate VNDK-SP to /system/lib/vndk-sp and add RS libs to VNDK-SP" into oc-dev am: c43a4ad4bc
am: 7eccd838c0

Change-Id: I6a5ec9f6a65ddd39736691c1c208d9ca33ed340c