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

Change-Id: I99511660b5b93b0f2d47e61f917efbac3141ab11