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

Change-Id: I0f623e5cbc60e7fc5123679123ce821fac004158