Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK"