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

Change-Id: I1a0df89cc80cb3fe9387be6ba1b550659c32d2f4