Merge "Always use versioned VNDK directory"
am: dda4678a11

Change-Id: Ie4624b1be1f3ff2c3f82362e6a4e0da6c553c666