Merge "Add ro.vndk.version property"
am: 9d3d271673

Change-Id: Id82c6e0c62571c5b0a6f068edce876c42f6e50c5