Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" into oc-dr1-dev