Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 53401d7c35 am: 9b7fbccdb4
am: 8f54321751  -s ours

Change-Id: I09c8fc53049573573353c9960e385a86e704498a