Merge "Vendor modules in make also have __ANDROID_VNDK__ defined." into oc-mr1-dev