Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 53401d7c35
am: 9b7fbccdb4

Change-Id: Iefb1438bf398a6d8c6c7fd3c1ba2b980f51b96fa