Merge "android.os.VintfObject: update for VNDK version format change." am: eac8c121fe am: d9b9d49a66
am: bb2d749981

Change-Id: I330d9cd4fe23b62a605bd95790046c2e0b1aebb0