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

Change-Id: Ia434cf0ba57a6941ee69397a3ca1c344d70b36eb