Merge "Mark the modules as VNDK-SP in Android.bp" am: bc9924ed40
am: 028664fcd3

Change-Id: I818d55b42e19078bc8b232fe2c319db397ef1e7a