Merge "Add vndk tag for libunwindstack which must be a vndk-sp" am: 6139592321 am: 221d3b4c75
am: dd3fbb94d8  -s ours

Change-Id: I724e0b6485f65410b1ff5f74331184f6c0417f15