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