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

Change-Id: Ifcee8b5ce344d9b79a304612e240ab319efccac0