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

Change-Id: Ic58f8cf0f8718106416105ada7068dc3de050dc5