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

Change-Id: Ied6dff56c653241d56d0e4d378ec5d3e9ce2a233