Merge "Use versioned VNDK directories in ld.config.txt"