Merge "Fix for building apicheck tool"