Merge "Define vndk_product namespace for product apps"