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

Change-Id: I4ac01e17f3930635b900128220d923312b2fbb6d