Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
am: 53401d7c35

Change-Id: Ib83b45cb3a9f72e83bb6a38d1e471527841e85f1