vndk-def: Collect non-AOSP libs must be copied am: 30598eaf81  -s ours
am: 4e635a41a1  -s ours

Change-Id: I75fa7165b322769a3cf0768568c56a24d582e5e7