Merge "Define vndk_product namespace for product apps" am: 6eb18354c1 am: 7df20a75d3

Change-Id: I98e7a8604acbc0d324d3ed831f92b8b84788b944