Merge "vndk-def: Fix check-dep errors on vendor_libs" am: 9a882a68a1 am: a2e0e4e514
am: 3f9596c384

Change-Id: I26635299f8bf45b4f7ab2c85359738fa265153a9