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

Change-Id: Ie0950060a440c3372b90624f8382447d768df4c3