Merge "Use ro.product.vndk.version for unbundled product apks" am: cbfcd44f68 am: e0e165f06e

Change-Id: I6507b31c3a1b36830a231064e560d978b9427f5c