Merge "Add ro.vndk.version property"