Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
am: 72ec97a21e

Change-Id: Ie3316227fcabc9329c2391b793ae7c17723604cb