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

Change-Id: Ia6031aceaa3def053421ecf1d49fa347519f075c