Merge "Mark the modules as VNDK-SP in Android.bp"