Merge "Remove kIsVdexEnabled."