Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH"