Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
am: 9e1e7e1a93

Change-Id: I7e0c72ee79b75512a64e4d79c63eceb5b46f0af9