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

Change-Id: I93d737ebf3d4a9b93188311685791e3f57e1247c