Merge "vndk-def: Add libvulkan.so to SP-NDK."