Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: cc10db2c9e am: 314e645a2a am: d16cf94146  -s ours
am: cfdb96d554  -s ours

Change-Id: Ie9784c200e9f3a9465a626236d76c1d1ce6d6e86