Merge "Add aosp_$arch target products to P VNDK snapshot" into pi-dev