Merge "Mark the modules as VNDK in Android.bp" into oc-mr1-dev