Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 45d1ce0384
am: 77221f5321

Change-Id: Ie004d9982dbf456c3c3cd86427bf08600fc7d552