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

Change-Id: Ie6a855659d2e0d1d6a4de1f295c1f9293286418f