Merge "Always use versioned VNDK directory" into pi-dev am: 5789b80a2b
am: 85e72361ac

Change-Id: I67a36bee692182346cd57b51ca96bd8508b3d17f