[automerger skipped] Merge "Add aosp_$arch target products to P VNDK snapshot" am: 795f1188 am: 0b0735fc -s ours am: be61b70d -s ours Change-Id: I0e8877a779fa91a4059dcd67fb245fdfaeed423d