Merge "Use versioned VNDK directories in ld.config.txt" am: 84de4c0a89
am: 27e44ad179

Change-Id: I41ad6034f7d518e662e29e69ca26f7d404278128