Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: df9faefc5d am: e7299d3679 am: 620eb8f5c2  -s ours
am: b4f694c722  -s ours

Change-Id: Iadcfddb6695c7d096c1cd041cc15b784da962fc1