Merge "Add product_services support to ld.config.vndk_lite"