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

Change-Id: I79475dff78b02dd8d21a94f4460eb5aad09087e9