Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: df9f68eb9b am: 507d6a71ee
am: 314d1b0152

Change-Id: Id642f71f34e4a5ef993eafa7c515805a4fdce0d8