Merge "android.os.VintfObject: update for VNDK version format change."