Merge "Allow vold to check apex files"