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

Change-Id: Ia32c4395546ef58dee88bfbae77ea52d506a1c63