Merge "Mark the modules as VNDK-SP in Android.bp" into oc-mr1-dev am: 58f38017f7
am: a9823defe7

Change-Id: I55cb29ab135ade95119b05355fdaa493d52ef0d3