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

Change-Id: I49b3841f627a6e8b25e91e02dce491cb526886d9