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

Change-Id: I781e0f1f9e70e584b986d5b2c7e7e87804c52157