Merge "Always use versioned VNDK directory" into pi-dev