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

Change-Id: I69512885ec3372e45f775bb7f6a8b828f8be490e