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

Change-Id: Ia49b181001a81d491bf639a1421294e5816a2867